bitkeeper revision 1.885 (4094465dmX2TefiJicy4taNzc0jiaw)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sun, 2 May 2004 00:52:45 +0000 (00:52 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sun, 2 May 2004 00:52:45 +0000 (00:52 +0000)
commit3882a78594317ddcaeb97e585080a998ab8a17fe
tree2d0182dc449cbd96e404e3b94f8964e393fd39f0
parent685d71bab181325dd4f5a5965314fa647fdf68a6
parentf7a3ec9450a8f4aeb43bfa4ad65636325e756a61
bitkeeper revision 1.885 (4094465dmX2TefiJicy4taNzc0jiaw)

manual merge
tools/xc/lib/xc_linux_build.c
tools/xc/lib/xc_netbsd_build.c
xen/common/kernel.c
xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c
xenolinux-2.4.26-sparse/arch/xen/mm/ioremap.c
xenolinux-2.4.26-sparse/include/asm-xen/proc_cmd.h